stdlib: remove comparison with EOF macro to comply with MISRA

Ensures compliance with MISRA C-2012 Rule 22.7

Change-Id: Ifbe0926a24ba0dca18174e1aa87313a63bba50fb
Signed-off-by: Jonathan Wright <[email protected]>

diff --git a/lib/stdlib/puts.c b/lib/stdlib/puts.c
index 693a6bff3df6a31d15980a9d4c07f3f8b1fee786..284cf8c52aab33c10b01e6b17d0022851a810eb9 100644 (file)
--- a/lib/stdlib/puts.c
+++ b/lib/stdlib/puts.c
@@ -9,23 +9,17 @@
 int puts(const char *s)
 {
        int count = 0;
-       while(*s)
-       {
-               if (putchar(*s++) != EOF) {
-                       count++;
-               } else {
-                       count = EOF;
-                       break;
-               }
+       while(*s) {
+               if (putchar(*s++) == EOF)
+                       return EOF;
+               count++;
        }
 
        /* According to the puts(3) manpage, the function should write a
         * trailing newline.
         */
-       if ((count != EOF) && (putchar('\n') != EOF))
-               count++;
-       else
-               count = EOF;
+       if (putchar('\n') == EOF)
+               return EOF;
 
-       return count;
+       return count + 1;
 }